From 846c9386b80bf041152ee0b5b43b1c3b979c3559 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Wed, 31 Aug 2005 11:25:36 +0000 Subject: [PATCH] fixed build of extensions --- ChangeLog | 4 +++- Makefile.am | 2 +- babl.pc.in | 2 +- configure.ac | 40 ++++++++++++++++++++++++++++++---------- extensions/Makefile.in | 27 +++++++++++++++------------ 5 files changed, 50 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index def55c7..7f8f2be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,9 @@ * Makefile.am, * babl.pc.in, - * extensions/Makefile.in: Fixed build of extensions. + * configure.ac, + * extensions/Makefile.in: Fixed build of extensions. (awaiting + fix of babl/babl-extension.c to use new #defines) 2005-08-30 Øyvind Kolås diff --git a/Makefile.am b/Makefile.am index 8cfe7e2..4c3528d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = babl \ tests \ diff --git a/babl.pc.in b/babl.pc.in index 4b995f3..3922ced 100644 --- a/babl.pc.in +++ b/babl.pc.in @@ -7,5 +7,5 @@ Name: babl Description: Dynamic; any to any, pixel format conversion library Version: @VERSION@ Libs: -L${libdir} -lbabl -ldl -Cflags: -I${includedir}/babl-0.0/babl +Cflags: -I${includedir}/@PACKAGE_NAME@-@BABL_API_VERSION@/@PACKAGE_NAME@ diff --git a/configure.ac b/configure.ac index 7000c06..e0e3b39 100644 --- a/configure.ac +++ b/configure.ac @@ -1,27 +1,35 @@ -AC_INIT(babl/babl.h) -AM_CONFIG_HEADER(config.h) +AC_PREREQ(2.54) -BABL_MAJOR_VERSION=0 -BABL_MINOR_VERSION=0 -BABL_MICRO_VERSION=1 +m4_define([babl_major_version], 0) +m4_define([babl_minor_version], 0) +m4_define([babl_micro_version], 2) -BABL_API_VERSION=0.0 +AC_INIT(babl, babl_major_version.babl_minor_version.babl_micro_version) +AC_CONFIG_SRCDIR(babl/babl.h) +AC_CONFIG_HEADERS(config.h) + +BABL_MAJOR_VERSION=babl_major_version +BABL_MINOR_VERSION=babl_minor_version +BABL_MICRO_VERSION=babl_micro_version +BABL_REAL_VERSION=babl_real_version +BABL_VERSION=babl_version + +BABL_API_VERSION=babl_major_version.babl_minor_version AC_SUBST(BABL_API_VERSION) BABL_LIBRARY_VERSION=0:0:0 AC_SUBST(BABL_LIBRARY_VERSION) -PACKAGE=babl +PACKAGE_NAME=babl +AC_SUBST(PACKAGE_NAME) BABL_VERSION=$BABL_MAJOR_VERSION.$BABL_MINOR_VERSION.$BABL_MICRO_VERSION BABL_RELEASE=$BABL_MAJOR_VERSION.$BABL_MINOR_VERSION AC_SUBST(BABL_RELEASE) AC_SUBST(BABL_VERSION) -VERSION=$BABL_VERSION - -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) +AM_INIT_AUTOMAKE(no-define) AC_PROG_CC AM_PROG_LIBTOOL @@ -35,12 +43,24 @@ if eval "test x$GCC = xyes"; then esac fi +babl_extension_dir="$(libdir)/babl" +AC_SUBST(babl_extension_dir) + AC_PATH_PROG(INKSCAPE, inkscape, no) AM_CONDITIONAL(HAVE_INKSCAPE, test "x$INKSCAPE" != "xno") AC_PATH_PROG(W3M, w3m, no) AM_CONDITIONAL(HAVE_W3M, test "x$W3M" != "xno") +dnl =========================================================================== + +AC_DEFINE_UNQUOTED(BABL_PATH, "~/.babl-$BABL_API_VERSION:/usr/local/lib/babl-$BABL_API_VERSION:/usr/lib/babl-$BABL_API_VERSION", [search path for babl extensions (default value of enviroment variable)]) +AC_DEFINE(BABL_PATH_SEPERATOR, "/", [string used to seperate directories in a path string]) +AC_DEFINE(BABL_LIST_SEPERATOR, ':', [seperator between paths in BABL_PATH]) + +dnl =========================================================================== + + dnl =========================================================================== AC_CONFIG_FILES( diff --git a/extensions/Makefile.in b/extensions/Makefile.in index cb4bb42..3e80757 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -1,10 +1,14 @@ # General minimalistic compile file for self contained single # file babl_extensions +CC = @CC@ + CFILES = $(wildcard *.c) +CFLAGS = @CFLAGS@ SOBJS = $(CFILES:.c=.so) all: $(SOBJS) +CFLAGS += -Wall %.so: %.c $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< @@ -19,22 +23,16 @@ CIE-Lab.so: CIE-Lab.c - -############################################################################# ############################################################################# -CFLAGS = -O2 -Wall LDFLAGS = -shared -lc CFLAGS += -I../babl -#`pkg-config babl --cflags` -#LDFLAGS += `pkg-config babl --libs` - clean: - rm -f *.so + rm -f $(SOBJS) distclean: - rm -f *.so Makefile -maintainerclean: distclean + rm -f $(SOBJS) Makefile +maintainer-clean: distclean mostlyclean: subdir = extensions @@ -42,13 +40,18 @@ srcdir = @srcdir@ top_builddir = .. INSTALL = @INSTALL@ SHELL = @SHELL@ +ext_dir = @prefix@@libdir@/babl-@BABL_API_VERSION@ install: user-install - #FIXME: need a proper install target as well user-install: all - $(INSTALL) -d /home/pippin/.babl - $(INSTALL) $(SOBJS) /home/pippin/.babl + $(INSTALL) -d $(ext_dir) + $(INSTALL) $(SOBJS) $(ext_dir) +distdir: + cp $(CFILES) $(Makefile.in) $$distdir + +dvi: + #playing along with automake .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- 2.30.2